cc1afc2d3ab4b5f83f744bfca41b1094555628d7,gt-elasticsearch/src/test/java/mil/nga/giat/data/elasticsearch/FilterToElasticTest.java,FilterToElasticTest,testAndWithBbox,#,432

Before Change


        And filter = ff.and(ff.id(ff.featureId("id1")), ff.bbox("geom", 0., 0., 1., 1., "EPSG:4326"));
        PolygonBuilder shape = ShapeBuilder.newPolygon().point(0, 0).point(0,1).point(1,1).point(1,0).point(0,0);
        AndFilterBuilder expected = FilterBuilders.andFilter(
                FilterBuilders.idsFilter().addIds("id1"), 
                FilterBuilders.geoShapeFilter("geom", shape, ShapeRelation.INTERSECTS));

        builder.visit(filter, null);

After Change


		And filter = ff.and(ff.id(ff.featureId("id1")), ff.bbox("geom", 0., 0., 1., 1., "EPSG:4326"));
		PolygonBuilder shape = ShapeBuilder.newPolygon().point(0, 0).point(0, 1).point(1, 1).point(1, 0).point(0, 0);
		BoolQueryBuilder expected = QueryBuilders.boolQuery()
				.must(QueryBuilders.idsQuery().addIds("id1"))
				.must(QueryBuilders.geoShapeQuery("geom", shape, ShapeRelation.INTERSECTS));
//		AndFilterBuilder expected = FilterBuilders.andFilter(FilterBuilders.idsFilter().addIds("id1"),
//				FilterBuilders.geoShapeFilter("geom", shape, ShapeRelation.INTERSECTS));